Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 8 Apr 2010 14:13:22 +0000 (14:13 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 8 Apr 2010 14:13:22 +0000 (14:13 +0000)

Trivial merge